* lisp/dired.el (dired-get-filename): Fix 'verbatim case of previous change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b149a63203a0cc4b052eb46265cda16b91fb6e5..2018963e6c90aa1edc638ec2d184137648708544 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-14  Glenn Morris  <rgm@gnu.org>
+
+       * dired.el (dired-get-filename): Fix 'verbatim case of previous change.
+
 2012-01-13  Glenn Morris  <rgm@gnu.org>
 
        * dired.el (dired-switches-escape-p): New function.

diff --git a/lisp/dired.el b/lisp/dired.el
index 42d2c7d7a5a2d06f80a3223cb23c2151a2acdb8e..f1a778ad05a4a312106792858d7c83b83486049a 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2107,10 +2107,15 @@ Otherwise, an error occurs in these cases."
           ;; Unescape any spaces escaped by ls -b (bug#10469).
           ;; Other -b quotes, eg \t, \n, work transparently.
           (if (dired-switches-escape-p dired-actual-switches)
-              (let ((start 0))
+              (let ((start 0)
+                    (rep "")
+                    (shift -1))
+                (if (eq localp 'verbatim)
+                    (setq rep "\\\\"
+                          shift +1))
                 (while (string-match "\\(\\\\\\) " file start)
-                  (setq file (replace-match "" nil t file 1)
-                        start (1- (match-end 0))))))
+                  (setq file (replace-match rep nil t file 1)
+                        start (+ shift (match-end 0))))))
          (when (eq system-type 'windows-nt)
            (save-match-data
              (let ((start 0))